Merge "ChangeMergedEvent should always be called with merged patch set"